[XEN][POWERPC] secondary_cpu_init() does not return.

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
--HG--
extra : transplant_source : %A2%A4%A6%BD%C5%CD%ED%F3%FE%90bm%E9%B1l%9E%E8%98%F1x

diff --git a/xen/arch/powerpc/exceptions.h b/xen/arch/powerpc/exceptions.h
index 0dcc504620eb82801248015c1e984a74ef82b1e2..7a71faee8def7187049ec2d847b70aa16a26d340 100644 (file)
--- a/xen/arch/powerpc/exceptions.h
+++ b/xen/arch/powerpc/exceptions.h
@@ -52,5 +52,5 @@ extern ulong *__hypercall_table[];
 extern char exception_vectors[];
 extern char exception_vectors_end[];
 extern int spin_start[];
-extern int secondary_cpu_init(int cpuid, unsigned long r4);
+extern void secondary_cpu_init(int cpuid, unsigned long r4);
 #endif

diff --git a/xen/arch/powerpc/setup.c b/xen/arch/powerpc/setup.c
index 39245d425075d450dd16dde377df829c458bdc94..aaceab164b73258cf351b77c7008a3b8acec2cc4 100644 (file)
--- a/xen/arch/powerpc/setup.c
+++ b/xen/arch/powerpc/setup.c
@@ -256,7 +256,7 @@ static int kick_secondary_cpus(int maxcpus)
 }
 
 /* This is the first C code that secondary processors invoke.  */
-int secondary_cpu_init(int cpuid, unsigned long r4)
+void secondary_cpu_init(int cpuid, unsigned long r4)
 {
     struct vcpu *vcpu;
 
@@ -274,7 +274,7 @@ int secondary_cpu_init(int cpuid, unsigned long r4)
     idle_vcpu[cpuid] = current;
     startup_cpu_idle_loop();
 
-    while(1);
+    panic("should never get here\n");
 }
 
 static void __init __start_xen(multiboot_info_t *mbi)